Merge changes from topic "fcc_2019"
am: aa5cb71764

Change-Id: I26aebb625273f4e218d467ef43246cfa0eea931b