Merge commit 'bbc9221' into master
am: d4aea7c865

Change-Id: Iffa9dcccea8ee4643a5c881131556d831729dcbc