Bug: 10538430 Change-Id: I933f075c5e84b637c4d171a7dcc685f0dc8a88df
Bug: 6370846 Change-Id: Ic7d75f1d242795e756e6fede988cfe4b5cc17f0e
Bug: 6370846 Change-Id: Ia68284b2402e52d835040da900a51cca669add2f