Merge changes If4bf6e86,I9c7fbd76 am: 32f239d14e
am: b8de01fb05

Change-Id: I8bca171ff3c1b9409b3cdca896bc95c4389f6b8c