Merge changes from topic "b147213487" into rvc-dev am: 8e726a2e am: 2d42c72f am: bd9a3d97 am: 9f1ad652 Change-Id: Icaff9e75d20f5c9b5ae0b1afddb5985576bf9019