Merge "Cumulative patch from commit 3d6953288b592704484864f41791f8c67ff9aa5a"
am: 8ed76874ba

Change-Id: I944365c63df399284439b57bcb0d6797f8cdee3b