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

Change-Id: I3449759cd9ebae747f733388497ffbb11954f2e1