Janice: Other AOSP Changes

Change-Id: I244f283b60f262848be4c93abd1d60d804325e41