Merge changes from topic "b150393918-lock-icon" into rvc-dev am: 2728fa3c am: c1c9801b am: e0a0413d Change-Id: I2e4d19fcaafee9aac9f4efbc903ba0202ac2d384