Merge changes from topics "2018g", "2018f"
am: 32e62238f5

Change-Id: Ib174307e5c85abd8d2ae32a9d176b76b571f9621