Merge changes from topic "apply-aosp-1209307-and-following" am: 9b7d89970a am: a6c9490e7f

Change-Id: I6ebb7201de5c606459859e5f79155f269e21c783