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

Change-Id: I1d84f0b6c6cfe961db2f754e965a0e53f0a51813