Merge "Cumulative patch from commit 3d6953288b592704484864f41791f8c67ff9aa5a" am: 8ed76874ba am: 9f86d83fec
am: 573a87f9a5

Change-Id: I62230258df9684eb4a0e625c26606b6d16ef1353