[automerger skipped] Merge "Synced the code from master branch" am: 64efbe1240 am: 418ef9973e
am: b0b539946f -s ours
am skip reason: change_id I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a with SHA1 0f844d168b is in history

Change-Id: I0d20087a13d99cb95e103093a53fb5ca3cd42768