Merge changes from topic "current-on-aosp" am: 0d30daba94
am: f4fda2e5e1

Change-Id: Ieeb897bf66ace99442b555086ff9636c44e9f0fc